Merge branch 'master' of https://github.com/justbur/emacs-which-key
authorjustbur <justin@burkett.cc>
Thu, 28 Jan 2016 20:04:05 +0000 (15:04 -0500)
committerjustbur <justin@burkett.cc>
Thu, 28 Jan 2016 20:04:05 +0000 (15:04 -0500)

Trivial merge